Merge "Seperate clockface specific callbacks" into tm-qpr-dev am: 883ecccd

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



Change-Id: I93be6d54612b8c6913ef5b1e1d2cd33727227720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>