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

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



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