FileSystemPermissionTest: fix bad cherrypick

Cherrypick had the effect
of applying a patch a second time where it had already been applied
(original patch was
The second cherrypick was not detected as a conflict, and inappropriately
patched other code.

Revert the second cherrypick.

Bug: 21876946
Bug: 21877279
Bug: 19549480
Change-Id: Ia0d5f8c815d9e7b6a650f03b0310483833f41086
1 file changed