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

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

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