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

Bug: 135460123
Change-Id: Ibb022c79c773191b24aec9bb456bfc6cb01d8e71
Merged-In: I9dbf402e02a0e97e3cffbdde99f7f2b3756b4647