Merge "Use androidx TestLifecycleOwner" into udc-qpr-dev am: 08ce30f8ec am: e4c76c6d36

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

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