Merge "Enable SoftKeymasterDevice logging."