[automerger skipped] Revert "Revert "Update TestLifecycleOwner to match converted to ..." am: f3afdfefb8 -s ours am: 96b8b0dc9f -s ours am: 96c68dc663 -s ours

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

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

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