[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 8a3d7b4802 -s ours
am skip reason: change_id Ib51a1198b9cc6b941407971f82edf9c4d365cf1c with SHA1 23bf184c29 is in history

Change-Id: I85eb723e78b717676d5643798db9a81cb394b8ab