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

No content change.

Bug: 135460123
Change-Id: I68b4f2771b2ff9cd89f5b95d0a66bc9517b7e128
Merged-In: I705adb517bc5cdd70c4f45fa627a274e4503dd2c