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

No content change.

Bug: 135460123
Change-Id: I24e5e38765de4e1a309deb1c54c0572478677134
Merged-In: I1dc1105688ca3684b3c2ff66ebf69cb58d6722cb