Merge cherrypicks of ['googleplex-android-review.googlesource.com/23725969', 'googleplex-android-review.googlesource.com/23676965'] into udc-release. am: 398f5f236f

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

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