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

No content change.

Bug: 135460123
Change-Id: Ic83ac9fe78ad277f06f9ee5952c57c919c3693ce
Merged-In: I5f3596d149f2f4319f780b43f38a1967a6ca2f51