Fix Bad Merge

My merging of Froyo changes reintroduced a test in
NoActivityRelatedPermissionTest that had already been
removed.

Change-Id: I103e615be7b32196a6eab0ad07016002fa25207c
1 file changed