Merge changes from topic "mrcasey-customactionflag" into udc-dev am: 8a12f04a61

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

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