Fix SplitPermissionsSystemTest and PermissionSplitTest

These permissions are no longer split.

Fixes: 179274819
Fixes: 179260898
Fixes: 179288163
Test: atest SplitPermissionsSystemTest

Exempt-From-Owner-Approval: Fixes presubmit test

Change-Id: I8eb8ce4bc81075dd996f3c736742c605696ce7c0
2 files changed