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

Bug: 135460123
Change-Id: I4a95f6b87c4bd29b5b47531e6153315db52019f2
Merged-In: Ieb5298f552c800e60647be5a75f754f0df5b374d