Merge "Set SoftKeymasterDevice flags correctly."