Merge "Add a flag for the fps of the AnalogClock" into sc-dev am: ef1e1dfb am: 1dc4d37c am: 7bb83187

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

Change-Id: Ie810a9225cde7ee30aa54d8a49781aed68036060