Merge "Convert ShortcutDemo Android.mk to Android.bp" into main