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

Bug: 135460123
Change-Id: I759888ae41781b68aedd1721065938e0def8721b
Merged-In: I17e579c2e94383d34beb64e82457b7a8d9f4c444