Revert "Revert "Update TestLifecycleOwner to match converted to ..."

Revert submission 23149513-revert-22208109-lifecycle_9778738-CXBRVAFFSZ

Reason for revert: <b/281883862 is fixed >

Reverted changes: /q/submissionid:23149513-revert-22208109-lifecycle_9778738-CXBRVAFFSZ

(cherry picked from commit 597905080e30398e77ed9a13bfb4449a41fca353)
(cherry picked from commit 05926e3aa200a7b1b11d4d8e3214ba76cbff9453)
(cherry picked from commit 8045928918144d900a6ea154fd7bdcba67490c82)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f3afdfefb81290ac4775960f300edc932f9b43bd)
Merged-In: Ib2019295c594e1f764c5fdf380014203ad109e12
Change-Id: Ib2019295c594e1f764c5fdf380014203ad109e12
1 file changed