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

No content change.

Bug: 135460123
Change-Id: I1dfed5105490d27692d9db5e0217c29f91c30728
Merged-In: I3d98bd70a659cad37d520fb0e7ecd631f622e8fb