Merge changes I7ad8d0b9,I8afdb13b into udc-dev am: 9d9a7263e5

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

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