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

Bug: 135460123
Change-Id: If99e98fa3092cb9bcb1240fe4945525f6881a106
Merged-In: I53ab66dd32b7a69f04226fccfdf372a66489964a