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

No content change.

Bug: 135460123
Change-Id: I0a9abe33b82b99d5ebe9d47b48cfd61ae411c60d
Merged-In: I157adcfcb80167f923a414bc4890cdf8b59e1a1a