Merge "Reset binder during unbinding" am: eda5da6b92 am: 03b0f9ca87 am: ae40794528

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580986

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I959dfef8d93d8bbd259c3c1b5561c7c7d4b1e0d0