Merge "Migrate CALLBACK_ON_CLEAR_CHANGE" am: 6f7c5e0914 am: 62d7bd9555

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

Change-Id: I40fc10b8f269530f671d8511435c5c62d0c1f655