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: I91d00fa878d65717fd9d5a6e90b310bcf786f4fb