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

No content change.

Bug: 135460123
Change-Id: Ib19915bc34ef30fb174b030e249422cbcb77dd6a
Merged-In: I859ac505f3b7d0ae307d42d902b7a1c8fd185f59