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

Bug: 135460123
Change-Id: I162046ce641900d9cc1717804ea9e02c84bbd49a
Merged-In: I8b74ae19788aaaca75ad44c465f7dc458117ccf1