[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: df9a7ab05a -s ours
am: 9cc49c4661 -s ours
am skip reason: change_id I29b3e3131804fcbc215e0adcbc5dc9cc0a77d220 with SHA1 0b0a9471f7 is in history

Change-Id: Ibb24b60d86a6ae8e35315b59e26d4d369b2a83b6