Merge "Enable clang-format on AOSP Music Player"
am: 879edc6ca4

Change-Id: I0b8b4872a6a33e8f88a3c723edf30e191363a60e