Merge "Merge "Ignore malformed shortcuts" into tm-dev am: 9bce00406b am: ad22d2adf1" into tm-d1-dev-plus-aosp am: ea10735cf7 am: c9e859ebc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20026353 Change-Id: I25a85f92493dec6448ca58131682151754d57f31 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: