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

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

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