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

Bug: 135460123
Change-Id: Ia8c02c6c39204b6c1bb97023c408d0431bb49494
Merged-In: Id112025ccf9343c809149f5b93c886af5508f5d9