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

No content change.

Bug: 135460123
Change-Id: I5fb910c22f3e430fd2e84301fe2c293dc9e22a08
Merged-In: I07994352b4a6da31c943f0e6704daec613d6f900