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

Change-Id: I04376072091874f72744794f1f2dc5bcee652418