Merge "Remove hwbinder" am: 1bf83b28d9 am: 2f3ad490b1 am: bf856b1aa1

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

Change-Id: Iae9a0ce89f495f9aa15d21c68790cd5d310bebea