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

Change-Id: Ief7adaa45a1406639d4d124aa28d07c3deaf2281