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

No content change.

Bug: 135460123
Change-Id: Ida363ddc0ffcee9f364cc29e867d34344e966f74
Merged-In: Id34b9a5175c55e22b1c2f2d1b3fb62a7e5f497d6