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

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

Change-Id: I94e2259793b4a91324a23d650718269463ae9623