Merge "Lifecycle" into udc-qpr-dev am: 553fec6f

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



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