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

No content change.

Bug: 135460123
Change-Id: Idb8d81be9d9877ab4796229229adfb52178f448b
Merged-In: I9d37ecefcc91ebab3bc798d0deed9e924ca828d3