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

No content change.

Bug: 135460123
Change-Id: Ie89519bea346d984bce2aae0a9dc5ec6f445d718
Merged-In: Iec250219138e8c87e80073e51f89be92ff7c4063