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

No content change.

Bug: 135460123
Change-Id: Ia65f853d45c44eab6b7458f5388308f88095354e
Merged-In: Ide45d9cbe2c437c140f6a756c8b9b04f13ec7a07