Merge "[automerge] DO NOT MERGE Add LifecycleCallback adapter. 2p: 396a7965" into sc-v2-dev-plus-aosp