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 am: c58413bf

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



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