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

Bug: 135460123
Change-Id: Id1e22149741ef9fb72b0bb81852c7b9bf3ae0583
Merged-In: I8a200386bb14368e18a2a28c74e9c88cc91e0286