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

No content change.

Bug: 135460123
Change-Id: Ia5a0ad2c3d13df83abca4685940298ef5f9386ad
Merged-In: Icd401ad4d25c9a48e3befba9d6aae66cc5f67785