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

Change-Id: I5407e6770a4d28430fca6b1ef7adebe8bde46e88