Merge "clang-format BinderLibTestService" am: 52850aef77 am: 751fb400a6

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1711558

Change-Id: Ibe1d1c390d1a24dc9e693eca9b7b26499749b9c8