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

No content change.

Bug: 135460123
Change-Id: I54807f3ff5722d00389495e46d745c6f1d4779ec
Merged-In: I0cddc58644ab80a4e10b52d9df8c7ecdecce2519