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

Change-Id: Iaa4e32b1be60d54cc32f1a5ba2cba5f881cb58fd