Merge "If keyguard has preferred refresh rate, always use it" into sc-dev am: 72553d5124

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

Change-Id: I1fe5a135eeaa61ec526977cd6fd9d0c3583a72a2