Merge "Fix kotlin deprecation warnings" am: f9bf6544 am: 255f4d79

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



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