This reverts commit f3e0eb8b0c.
Reason for revert: Droid Cop revert this CL due to it cause Cts fail on PermissionPolicyTest.testPlatformPermissionPolicyUnaltered
Change-Id: I062b2b9f25dbf388940930a81fd8e036b82b7f45
This reverts commit f3e0eb8b0c.
Reason for revert: Droid Cop revert this CL due to it cause Cts fail on PermissionPolicyTest.testPlatformPermissionPolicyUnaltered
Change-Id: I062b2b9f25dbf388940930a81fd8e036b82b7f45