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

Bug: 135460123
Change-Id: If5168b08718d9eece2a9d2b07738c5438151a53b
Merged-In: I4d60d2ad06007842be6af1f2ab844917f18cc629