Revert "API tweaks"

This reverts commit f3e0eb8b0c9e334138b0e663dfb498e34144877b.

Reason for revert: Droid Cop revert this CL due to it cause Cts fail on PermissionPolicyTest.testPlatformPermissionPolicyUnaltered

Change-Id: I062b2b9f25dbf388940930a81fd8e036b82b7f45
5 files changed