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

[automerger skipped] Fix more kotlin nullable errors in services.permission am: 8bcfcd29 am: 623af71f am: 22242a12 -s ours

am skip reason: Merged-In Ib3358be57d7dd401fd2014ade3e58f9fc6c2b6a7 with SHA-1 d84e31b5 is already in history

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



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