Fixes based upon UX feedback am: 72e9bda3d3 am: 1c8def6432

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

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