[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 1a68b8d2b9
am: 3d0e53b900 -s ours
am skip reason: subject contains skip directive

Change-Id: I8155c126e5b9d30f6b943ed45c5b047df087a4d9