Merge "Convert ShortcutDemo Android.mk to Android.bp" into main am: eecc419e24

Original change: https://android-review.googlesource.com/c/platform/development/+/2821119

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