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

No content change.

Bug: 135460123
Change-Id: Ied1ed7261f626d0bcc00d55fff7d41e58c6dc7ec
Merged-In: Iee54a2d226deff786a190480b6ca1d6f7424992c