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

No content change.

Bug: 135460123
Change-Id: I57f47240e9bbe0d9d72cbf28480370a4402e10ec
Merged-In: Ia7ae30503ccd3358851e80258a450f8cd8030f52