Disable activities in a way allowed on a user build

Bug: 15900074
Change-Id: Ic7e1ebe2f9e7e536e2fb126087669774d1a105d3
3 files changed