[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 77985e2b -s ours
am: 7a16e5d2 -s ours
am skip reason: change_id Id91aabbe6f7e721a807826d5f0661993e5dfe563 with SHA1 8e19a7a1 is in history
Change-Id: Ie887dd3102b685bdae767eb4c54a58f0afd9e12a