Merge "Revert "Revert "Update TestLifecycleOwner to match converted to ..."" into udc-qpr-dev am: 72b7c90fd2

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

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