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

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

Change-Id: Ib004fe722b515d4efd25da35918510e206c19519