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

No content change.

Bug: 135460123
Change-Id: I9157f8f24b19769cbbecd782705c50e71af0560e
Merged-In: I6cf6c323b06b1b2f50112d30b162d1530ef816cf