[automerger skipped] Revert^2 "Lifecycle has to use kotlin syntax" am: 562eabae -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: Ic49527bdc72bae96ef2a1e3ee95a6c5482ede285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>