Merge "Clean up resource correctly when client died." into tm-dev am: cdd99897

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17019091

Change-Id: I12382860f2c0fbcb1103246192b612fea9d6d21f