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

Change-Id: I0325bd93b318e0a1e6f21806771c5a708c573c0f