Merge "Stop apps with Storage Managers from launching activity when disabled"...
Merge "Stop apps with Storage Managers from launching activity when disabled" into nyc-mr1-dev am: 88d3cb71
am: c9be13f2
Change-Id: Ia249e3ea91b80d443be64c19f0a89da133a5a2c8