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

No content change.

Bug: 135460123
Change-Id: I75b2c24d0dd0e9478727351f4fd0f0be898e815e
Merged-In: Idc05da05ba506ef82c18bde571bc95171f0a7e2b