Merge "libbinder_ndk_unit_test: log service test cbs" am: 88bd7470e0 am: 7609df6865 am: d2a041a4d8 am: 01bd4ee56b

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

Change-Id: If89669a61053ae073a63e70761cf4176d33628e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>