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

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



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