commit f8f47c569db00b15a1374676bacb4c90dd8ceddf
author Eran Messeri <eranm@google.com> Tue Nov 03 16:49:30 2020 +0000
committer Eran Messeri <eranm@google.com> Wed Nov 04 10:07:06 2020 +0000
tree 53b013a8484ca5b61d8bd9e0ea8dec73e61ae09b
parent 539aa9a22c2d656386f7b02dd03270ac51d6827f

DO NOT MERGE: Introduce DPMS shim for active DO/PO check

Introduce a shim into DevicePolicyManagerInternal &
DevicePolicyManagerService so that NetworkStatsAccessTest would not
diverge from internal development branches.

The DevicePolicyManagerService refactoring on the internal branch
removed isActiveAdminWithPolicy in favour of isActiveDeviceOwner and
isActiveProfileOwner.

These methods are being made available in AOSP for
NetworkStatsAccessTest.

Bug: 170459325
Test: atest NetworkStatsAccessTest
Change-Id: Ic7e0898989fb8222aaba2b35436765c04eb3250c