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

No content change.

Bug: 135460123
Change-Id: I5d8caedee80a3a6bf64402ec36858c088899de8c
Merged-In: Ic655324c52447411209c7ab8c225af31e3f92241