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: I3b8d908c7774b14f09ef52d3b4b14d811e2f2889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>