Merge "Fix kotlin nullable errors in services.permission" into udc-dev-plus-aosp am: 63d99ccbfe am: c6fa90ec5b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24517143

Change-Id: I4891eb506ac93aab50eeb2c41f9f8ebe45109b38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>