[automerger skipped] Merge "Fix kotlin nullable errors in services.permission"...

[automerger skipped] Merge "Fix kotlin nullable errors in services.permission" into udc-dev-plus-aosp am: 63d99ccb am: c6fa90ec am: db5d5d3a -s ours

am skip reason: Merged-In Iead08db297fa20963df7ee83b19d5ac76d0d4846 with SHA-1 8583ef80 is already in history

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



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