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

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

Change-Id: I223de9c13b78deb06bcfb317e9a90cfb8016c504