Merge "Fixed Handler Leak on DistanceClassifier" am: 0836d630a5

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

Change-Id: I1e54d67f0a5c612288127bd83662d5b84ece35f9