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

Change-Id: Ib1b9fe6ba5569bbff7686b2209571c3c5468284f