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

Bug: 135460123
Change-Id: I669448874ec192f6b8f1453e2237af62a024776a
Merged-In: Ia1a385c5de9cc97dadb3aeb0482c4f0ce9803573