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

No content change.

Bug: 135460123
Change-Id: I39a6443638f9792afeb6c15f94b5dcb0ce718b12
Merged-In: I1582e1bec08f68ef086f10d9e78c8355b0408cd7