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

Change-Id: I9fdd6871e65b83f19e0a3be0596b08e5e27794d4