[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 19fb419f -s ours
am: ad795e6b -s ours
am skip reason: change_id I728e2f9c7c784b9e1cc06c3ab35695e3978fe366 with SHA1 e0efd704 is in history
Change-Id: Id63b3f765e5dc1b57eeb6be3351e67891024705c