[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 527066ce13 -s ours
am: 3f97eaec9e -s ours
am skip reason: change_id Ifde03b122e85e07fdd557f512e4a148873f9f0f7 with SHA1 f0364dc79b is in history

Change-Id: I8a8f75c6ffb995f102f6c94e0d77f6130f8efaf8