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

[automerger skipped] Merge "Revert^2 "Lifecycle has to use kotlin syntax"" into udc-dev-plus-aosp am: 38e9c2e9 am: f32dc8d3 -s ours

am skip reason: Merged-In I170a7b21ca63c8e655bfb1735e33c9b163ff3d72 with SHA-1 08e2fd0c is already in history

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



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