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

No content change.

Bug: 135460123
Change-Id: Iebb984fee5237bb2a06c2474798869cce9398ea8
Merged-In: I245080494d61372a3d972fc87e1ccc5ad8e8ed5a