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

No content change.

Bug: 135460123
Change-Id: Ie3b798308affb1951b157a6364976b47815c4e34
Merged-In: I97b1574b40b11d420d5ca9a00900b35816844ed0