Merge "Merge "If keyguard has preferred refresh rate, always use it" into...

Merge "Merge "If keyguard has preferred refresh rate, always use it" into sc-dev am: 72553d51 am: 9d881ac1" into sc-v2-dev-plus-aosp am: 1dd0444c

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

Change-Id: If74fc7a4d2288adb5cd0feb9e517329fef874b9b