Merge "Adding an API that provides a map of shortcuts to be replaced." into udc-dev am: 1e69f441

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



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