Merge "Stop relying on the local cache in KeyguardUpdateMonitor to determine whether user storage is locked." into main