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

No content change.

Bug: 135460123
Change-Id: If26f792d5bb50fcad66b32f80fc2f6202d331f43
Merged-In: If1690acf0fce4194c844e95e9174005dff861bbc