Merge "Kotlin 1.5.31 compatibility" into sc-v2-dev am: 8316f682ec am: 705308d960

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

Change-Id: Iac6bd0a4a4ad6a11b03ad5cd5730017324451ff8