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

No content change.

Bug: 135460123
Change-Id: I15e4628e6d8a753c37f4d339c76d26153f053a14
Merged-In: I2db8e54c89620d3d8697139dbcf33c56226474b4