[automerger skipped] Merge "Revert^2 "Lifecycle has to use kotlin syntax""...

[automerger skipped] Merge "Revert^2 "Lifecycle has to use kotlin syntax"" into aosp-main-future am: 2d7cf7d4 -s ours am: dcfe521e -s ours

am skip reason: Merged-In I170a7b21ca63c8e655bfb1735e33c9b163ff3d72 with SHA-1 280994a5 is already in history

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



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