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

Change-Id: I7fc80407feedfaf72e58eb1d537b1b332fdf21f0