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

No content change.

Bug: 135460123
Change-Id: If4e4245914e6973f82eb1cb16ea9707c04cf9ba7
Merged-In: I8916b664519a85b79710ba430738a505c25a28e0