Merge "hardware keyguard HAL"