[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 82e4d0f00d -s ours
am: 9af2f3bf69 -s ours
am skip reason: change_id Id34b9a5175c55e22b1c2f2d1b3fb62a7e5f497d6 with SHA1 6e57c01c49 is in history

Change-Id: I833b0e7d64d807cf02fef53fa779ee080be029c8