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

Change-Id: I9677219caef8f9515a935e6b535c5c950cb41751