[automerger skipped] Merge "Revert "Revert "Update TestLifecycleOwner to match converted to ..."" into aosp-main-future am: 95b4788eb4 -s ours am: 44c56e5fd7 -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: Iadf2c6334f5a96f3309cd159faa3931ed2dadf5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>