Merge "Add traces for shortcuts, app targets and icons" into udc-dev am: 71f770aed2 am: f895d5584e

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

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