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

No content change.

Bug: 135460123
Change-Id: I3119ef949148d006ec46d52f822d60df3a0e3f16
Merged-In: I963225854cfc4a202d9b9829373a3de7e47d96a7