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

No content change.

Bug: 135460123
Change-Id: I2bc57b99adee7d064e89fb2f6a5a772c11b66128
Merged-In: Icbf0718fde5088365502c9e4b410f14796c161a5