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

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

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