Merge "Avoid bad string conversion in RecordedBinder error log" am: 6990844e...

Merge "Avoid bad string conversion in RecordedBinder error log" am: 6990844e am: 2f8bd5aa am: 688e294b

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



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