Merge "Enable clang-format on AOSP Music Player"