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

Bug: 135460123
Change-Id: Ib65b2e0e55cd046797bf3d60ddcc2a7558553e3a
Merged-In: I157ff596deb419a57eca32a9b8d954d76294f627