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

No content change.

Bug: 135460123
Change-Id: I20b6c7b11dbe3252cd3e77cf599db4b7042abbdd
Merged-In: Ib11313bef8f129e109d11e656b29c9b753137265