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