Merge "INSTALL_NON_MARKET_APPS lives in Secure again."