This moves the setting from System to Secure per review. Bug: 16381952 Change-Id: I2497ca66b4f346839490c29295528fac70e94494