Merge "Convert ShortcutSample/Android.mk to Android.bp" am: 16d4d75ae6

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

Change-Id: I09362142f243127951682493c8ce9bf58c8eb2c7