Fixing admins not being removed from DpmMockContext am: 3cb2b49f44 am: b133a72f8b
am: 91a75a3a82

Change-Id: I6c4738d526cab8ec3b1f5a16f71580e6f8306c55