Merge "Change 'HDMI' on music notification panel UI to 'External Device'" am: 96c760a0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2221103



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