Merge "Revert^2 "Fix incompatibilities with Kotlin 1.5.0"" am: b7bccf0c am: c4db6971 am: 6a958235

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

Change-Id: I78f976f116ec0cc13dddcc9e328c3e01a40f5be5