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

No content change.

Bug: 135460123
Change-Id: I90a901724edea14a8814d8b9a8326abff615484d
Merged-In: I836b8ceed9e7816ddc2c280cbb9be3b722c51199