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

Change-Id: Ic432a1f1ea46f1becbc1df1a140af285d42d9c8d