Merge "Correct shortcut summary to have different software types of shortcut...

Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev am: 0c57f69f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157346



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