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

Change-Id: Ia3b3ab30ccad5daf94c5f8a1fc93e01c9892d0b4