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

Merge "Fix kotlin deprecation warnings" am: f9bf6544 am: 255f4d79 am: 9c081653 am: 1f09d229 am: 207cd61e

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



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