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

Change-Id: Ie7e471b770ac98af25313598b5d83d4e2a28d024