Merge "Fix kotlin deprecation warnings" am: f9bf6544a6

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

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