[automerger skipped] Merge "[automerge] DO NOT MERGE Add LifecycleCallback...

[automerger skipped] Merge "[automerge] DO NOT MERGE Add LifecycleCallback adapter. 2p: 396a7965" into sc-v2-dev-plus-aosp am: 6d2f6691 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If9aa97ebdd3aecfb6bc074707ccd192d11f1b5bc