Merge "Remove deprecated clock components" into udc-qpr-dev am: f114d7ee am: 6307cba3

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



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