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

Bug: 135460123
Change-Id: I579275c0fcfa15cfbb63970de459b681089e8a47
Merged-In: Id5785b498d8cc341cea8c4f7a69e6cd469fcbae2