Merge "HIDL Java: DeadObjectException" am: 628198a90f am: d16ad56f35 am: 6a9695953d

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

Change-Id: Ia4dac0da412a761cb940a92e4d939c584f19e69c