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

Bug: 135460123
Change-Id: Ifbb4b45d2d592e4a4ede265d2c882dc1cb4a0410
Merged-In: Idcc078c0e541c04633db6d94c613ac4c861ba963