Merge "Correct RequiresPermission for LockDevice" into main