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

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

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