Fixing admins not being removed from DpmMockContext
am: 3cb2b49f44

Change-Id: I9baefc5e069a2b8d37fa2b6c1e55d9eaebd02f26