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

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

Change-Id: Ica16e03e57745c946c42d4b8e09385fbac793ae4