Merge "Fix kotlin nullable errors in services.permission" into udc-dev-plus-aosp