[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 1f7a53d462 am: c338b7aedc -s ours
am skip reason: subject contains skip directive

Change-Id: Ia9e87856916457f1c0989ec9c987d38bdd03befc