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

Change-Id: Ifcedef06640333867d1d7591a44bcf255ae7653e