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

No content change.

Bug: 135460123
Change-Id: If9ff9398bb4a355a721fa451694aced24595e614
Merged-In: I3ec7243ec10f71f4bb7a4464c4563cb6d5be4ad1