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

Change-Id: Ib7a417910d1dc4a63b79cb58a8711e3cacf34265