Merge "CDD: Handheld: Require Lockdown mode and sleep timeout for devices  with secure lock screen" into pi-dev