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: I901fa11922fad9f8616b3b98ffac402348d64974
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>