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

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

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



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