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

No content change.

Bug: 135460123
Change-Id: If61fe3d45c72de1182a493e8405c99bb223b79e5
Merged-In: I231c58c0cdb60b8e7dcf9c017d247ee6f9f01c75