Merge "Deprecating secure setting install_non_market_apps"