[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 298ebabc53
am: 385496803c -s ours
am skip reason: subject contains skip directive

Change-Id: Ibfd946bdd48a7af28e215b0316ff619178914e43