[automerger skipped] Merge "Revert "Revert "Update TestLifecycleOwner to match converted to ..."" into udc-dev-plus-aosp am: 6002e350ff am: 360ca23784 -s ours am: cf5dc4b9eb -s ours

am skip reason: Merged-In Ib2019295c594e1f764c5fdf380014203ad109e12 with SHA-1 05926e3aa2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/24422701

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