Merge "Fixes @Nullable issues in System UI and WMShell." into udc-d1-dev-plus-aosp