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: d055e1bf" into sc-v2-dev-plus-aosp am: e24847a6

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

Change-Id: I453f35bd69656ad6cee58168aaa113ec7d6f80f2