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

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

am skip reason: subject contains skip directive

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

Change-Id: I7f8b7811eed3a9ec52a2fef3bcc84776512b9765