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: If820e41abf3a50bdf0beb049fa92eee92285355e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>