Merge "Replace KeyguardStateControllerImpl ArrayList w/ ConcurrentHashMap" into main