Merge "Preventing component spoofing during getShortcutIntent" into sc-dev am: f59889a0 am: e7db4157 am: 108c9510

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14669179

Change-Id: Icf07dc95665fd230474760ac74d486c62b861964