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

Change-Id: Ib74517c9bb0394b8154875801c8d2eff6270d5d3