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

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

Change-Id: Ie426df5c3ce20df14b0820daafe5d72a959b2e8e