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

No content change.

Bug: 135460123
Change-Id: I3bbfc5dd7bf9a38120ef83a6810039e8f06b6224
Merged-In: Ic9046fa1839a2aed313702f73f1c809d7879490b