Merge "Merge "Allow different tick rates for some clock designs" into...

Merge "Merge "Allow different tick rates for some clock designs" into tm-qpr-dev am: c6a131a1" into tm-qpr-dev-plus-aosp am: bc5fa173

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



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