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

Change-Id: If16103f75d88ee8a272c5f93b6082c2f5d4559fe