Merge "Make ShortcutLoader fully mockable" into udc-qpr-dev am: 2c13ee38db am: 25262f6818

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

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