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

Bug: 135460123
Change-Id: I1037d2cd43cd2607de190bc020914c6fdc730b03
Merged-In: I73d74715a8dc817b6aacb7fac3460cad0054be3a