Merge "Add log when upfps overlay isn't in sync with KeyguardUpdateMonitor" into sc-v2-dev