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

No content change.

Bug: 135460123
Change-Id: I83301e9e903646a90bc3284e777b8eb60129f165
Merged-In: If379604dd96f6ffdd1fd3d4ed224f474eb8536b8