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

No content change.

Bug: 135460123
Change-Id: Iaee2d60e464f1dd18be32db7e09b370bf4a7320f
Merged-In: I17ba1e731bd403ec39551ccbae7b7a614415844e