Merge "Convert ShortcutSample/Android.mk to Android.bp" am: 16d4d75ae6 am: 4472cf6306 am: 825c1c2b43 am: b0c776c35d am: b681ebf3ad
Original change: https://android-review.googlesource.com/c/platform/development/+/1691910 Change-Id: I9ef38f8211b86a89186c44d2ff4fce4ed82b952e
This commit is contained in: