Merge "DevicePolicyManager: Make installed keys user-selectable by default."