Merge "Fix ChooserActivity stuck disabled" into udc-dev am: 63d9e20f53 am: ffd8c9c279

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

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