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

No content change.

Bug: 135460123
Change-Id: I76e33e8bd71c11eb8901e5cf0b25c9cd23177a78
Merged-In: I5deecae030bca06bb7abfa7d7714cfbe3e0c6a78