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

No content change.

Bug: 135460123
Change-Id: Ifb3ce0027863d25cd548426f3aec5507b393db93
Merged-In: I4d381d4cd3be0c07b80afd00af3e46a34aa5fc89