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

No content change.

Bug: 135460123
Change-Id: I12f3a96cef381aa90bb14fbd7188aa78872735bc
Merged-In: Ief1c0eaed98d2a196bca066bfeb83a16e4410887