Merge "Destroy() client after onClientFinished." into sc-dev am: f5704ec276

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

Change-Id: Ib5be0dbb5215161f20a9e2d48a8d46e66038cfe6