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

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

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