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

No content change.

Bug: 135460123
Change-Id: If0d59a3377e55dcdf205c61fcfbb50d8350d385f
Merged-In: I47c959a585bf9084b5795b2c071d2837118e62e9