Merge "HIDL Java: DeadObjectException" am: 628198a90f

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

Change-Id: I95606f04b8e10c30e9af2ce23b4292457b873ec6