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

No content change.

Bug: 135460123
Change-Id: I3ec5f9d02981a6d3a96085b116ae52f1d7531667
Merged-In: I93faa55bf6fca544876d970d058f8aa5c5462f3c