[automerger skipped] RESTRICT AUTOMERGE Fixed and reenabled failing DevicePolicyManagerTest am: 14913d1d am: 5b21f26e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I403061b2d272bb6dec753fd6f2ef4614cc2a79dd