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

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

Change-Id: I0da91020cb1e34626a742ed8bfcc7c71fa0db903