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

No content change.

Bug: 135460123
Change-Id: I514d62687863ee7710c9f5c3da359a90f25042fa
Merged-In: If67ec7501d6624c60376ef35744dc55efcef7c75