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

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

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