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

Change-Id: I9995e31f1eec5762409024f4441cb8009332c77a