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

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



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