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

No content change.

Bug: 135460123
Change-Id: I16d4fc1ddebaa833bffc142662338e683db95687
Merged-In: I07ec5f5cdc33f8a57628e8d6f6d95bc47c543979