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

Change-Id: I9c6c6bd0d310d51a359be665c968169f9aceb7fc