Merge "Add DEVICE_LOCKED to the AndroidKeymasterCommand enum."