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

No content change.

Bug: 135460123
Change-Id: Ib9b5de3410bcc54988bbd04be5fd5a74c191f32a
Merged-In: I051470350ba70a77ec5d78ab5cc9ff02bf4aa4b2