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

Change-Id: I9987b02cc0353b4bad45198c8bc00c1a2086b0ab