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

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

Change-Id: Ie74fb08f20c99d932002f5305c8622a271534055