Merge "Add unregisterClient in instance close." into sc-dev am: f03fa75cc8

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

Change-Id: I3a73b621e2f9670c63e988f2ce36fb23740584d2