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

No content change.

Bug: 135460123
Change-Id: I0c28424dbd18458c4ced50b16f0857c32e7f771e
Merged-In: I25b8d7281e3e6449286370f04ed3467f90bf9135