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

No content change.

Bug: 135460123
Change-Id: I5e64e969936dbbae86d0d71cbad524fb24973af1
Merged-In: I7624257e4cffc690f0df4c844b23cd2accddca4b