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

Change-Id: I62f1079e81cef2db1cda361be262797fac7977d9