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

No content change.

Bug: 135460123
Change-Id: Ia907ceab022807ac46400d3165141d846fc3931b
Merged-In: Icca1852f77cb4cc70efa1f6ec95acfe013f8aac3