Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master

No content change.

Bug: 135460123
Change-Id: Idee710867cf0e97fef784a685b243025d415b01a
Merged-In: Ib51a1198b9cc6b941407971f82edf9c4d365cf1c