Merge "Revert "Revert "Update TestLifecycleOwner to match converted to ..."" into udc-dev-plus-aosp am: 6002e350ff

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

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