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

No content change.

Bug: 135460123
Change-Id: I796b11d51ecde1ec1b1b439bc14c9aec5eaf4e5c
Merged-In: I960e9c58447f384c429b4234cc298946c87a6e55