[automerger skipped] Merge "RESTRICT AUTOMERGE Fixed and reenabled failing...

[automerger skipped] Merge "RESTRICT AUTOMERGE Fixed and reenabled failing DevicePolicyManagerTest" into tm-dev am: 8c9047c8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ief1c3bf3073af2092c57ad2fa29ceace6bcd5e00