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

No content change.

Bug: 135460123
Change-Id: I6bbad1fb8e66cc2c7a53db7e580799833f2a7bcd
Merged-In: I67e45067cbd831b3a64e6a41b3553de9cbcbc192