Merge "Store original values of replaced settings in Settings.Secure" into rvc-dev

     */

    @VisibleForTesting

    public String getRealValueForSystemSetting(String setting) {

        return Settings.System.getString(mContext.getContentResolver(),

        // The real value irrespectively of the original setting's namespace is stored in

        // Settings.Secure.

        return Settings.Secure.getString(mContext.getContentResolver(),

                setting + SETTING_ORIGINAL_KEY_SUFFIX);

    }