Merge "Showing alert dialog when shortcut version higher than the App" into...

Merge "Showing alert dialog when shortcut version higher than the App" into tm-dev am: af919209 am: f8a6c58e

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



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