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

No content change.

Bug: 135460123
Change-Id: I04ea8eda87c5c5b0542acbf6814a93e21ad6d7fc
Merged-In: Id46d6370b1569ed342f5e31e36c98fa78f256c9a