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

No content change.

Bug: 135460123
Change-Id: I6e5faa426cf7865985bc8e34b0bf2f45525bd799
Merged-In: I0f2a4d898ccfab7f5215d9bbb3c2c9fd4f7329cf