[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 9775aaced0
am: 82b88bd6cb -s ours
am skip reason: subject contains skip directive

Change-Id: Ib0ee690fe162503b64d5e2aae2be4b99b40f2d4a