Merge "Minor renamings in DevicePolicyManager" into tm-dev am: 045cc2ab0b am: 96d671ff89
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16965508 Change-Id: Ifc13e08e35ed2871687392b2485cbbe9699238f6
This commit is contained in: