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

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

Change-Id: I1e9e845e11dcfd764739dd7f6aa1211155326545