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

No content change.

Bug: 135460123
Change-Id: I427e6afe276d5373a1340a16df848e38c4ff600a
Merged-In: Iec9970d4c0a3348b9a8aba76fb2ac042fe2453db