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

No content change.

Bug: 135460123
Change-Id: Ief8a32d432db5dfc932e373edc2946f541512baf
Merged-In: I97bbdae04e76ce32de0c25ed580b95ef2ec9a5ee