Merge "Convert ShortcutSample/Android.mk to Android.bp" am: 16d4d75ae6 am: 4472cf6306 am: 825c1c2b43

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

Change-Id: I7db13780c88857d0197d71d4d36aa2bbc9fd4910