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

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

Change-Id: Id396515fd8aa55a4263fbd2a5d65682fb78f41e1