Merge "Revert "Revert "Update TestLifecycleOwner to match converted to ..."" into aosp-main-future