Merge "Merge "Binder: Add more logging on Error" am: d9f3a3cf am: e3bda617 am: 6d908413" into oc-dr1-dev-plus-aosp