Merge "Merge "Binder: Add more logging on Error" am: d9f3a3cf37 am: e3bda6170d am: 6d908413bd" into oc-dr1-dev-plus-aosp