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

No content change.

Bug: 135460123
Change-Id: Ib3f235fe3d0dbf7d8193fe3735f6e5cecd1eaeb6
Merged-In: Idd1c83dc46f167f4b79092803539c3dd37a88ca3