Merge "Enables module to run in secondary users if enterprise features are off." into pie-cts-dev am: dffe3e0fb2
am: d59a944ea9

Change-Id: Iacc2984dfca4a71be45ec042ab1ada956738f617