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

No content change.

Bug: 135460123
Change-Id: I4ce8eb798889a62fb84d337d52b47526e7a6ba49
Merged-In: Ib82af17b8aaceab8357f6ba4280e9ec4d8eb4772