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

Bug: 135460123
Change-Id: I1bc7fef3b1bb1cb53cb724dd1d206ab9dbdece73
Merged-In: I8a07a2e852b9003de35997cd5d3a7bb340a079db