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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4fbf4bd553453537d45afdd5553dd7839df95238