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

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



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