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

No content change.

Bug: 135460123
Change-Id: I71c63c6080df92d295fbd8393c38c22ab19107f5
Merged-In: I8f31654013e9185123e651c59c442dd2d1a6b8b6