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

Change-Id: Id9443018c6a13a599fedde056cf01d0424abc6b7