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

No content change.

Bug: 135460123
Change-Id: I70fc102e00f98edd34b59661c00a8abbe37a8f26
Merged-In: I8a2c42ff322242f08fd6601536c3f9ee50d0f633