Merge "Remove android.permission.PermissionManager from blacklist" am: cbc3d5d0ea am: e52e78ba8e am: fb05e52a9d
am: 637868ad54

Change-Id: I8e3ddf4e175c3681884930bc894fadc9e076a7fe