Merge "Fix the issue shortcut cannot pinned in ShareSheet" into udc-dev am: dff2d185 am: 8b392c65

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



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