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

No content change.

Bug: 135460123
Change-Id: Ifa28b7e41863bba3e9a0fcc7fd8f6a93e78c2cff
Merged-In: I546c6b154289a305c58a3113bde79c777c811320