Merge "Simplify Music app manual BUILD setup." am: 7c229fd522

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Music/+/2420742

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