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

No content change.

Bug: 135460123
Change-Id: I426bd106789749df5532f9852452589019c2f1fb
Merged-In: Ic89adb9c2438b28e5af587f61ec0c21ec561c845