Merge "Fixes DPMS.getEnforcingAdminAndUserDetailsInternal()" into sc-v2-dev am: ce918f5f74 am: e00b6c3a90

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16511704

Change-Id: I00670961b8cd73a026c38cd3c81a28073f54e0a1