Merge "Fix 'Modifying dpm.setSecureSetting call for install_non_market_apps'"