Cleanup formatting

Test: m -j services.core
Change-Id: I3852261a3ec63c3da97edacc018572e067111abc
(cherry picked from commit 8f68fb3b329c76f575a3aac5135c5b886948c832)
2 files changed