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

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

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