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

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

Change-Id: Ifd953cb7d6e37a2a3b54528352777a202803249f