remove unneeded imports from pActManService and pContentResolver
add deprecated tag to enforcePrivacyPermission
Merge branch 'cleanup' of https://github.com/mateor/opd_frameworks_base into cleanup