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

No content change.

Bug: 135460123
Change-Id: I7e2a14706c47a800b6b6091086275e53b26e4765
Merged-In: I59e30906fce4dad6970787cdbe400ab8c56d6bbf