Merge "Remove non-shipping clocks from static list" into udc-dev am: be4b8621

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



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