Merge "Bump to depend on Lifecycle 2.5.0" into androidx-main am: c918cdb70d

Original change: https://android-review.googlesource.com/c/platform/frameworks/support/+/2127985

Change-Id: I35d9e7ed9578c8bcc1132618a1eb6a62a403d303
Signed-off-by: Automerger Merge Worker <[email protected]>