[automerger skipped] Merge "Fix non-inclusive terms in framework device policy...

[automerger skipped] Merge "Fix non-inclusive terms in framework device policy logic" am: 64add27a am: 3d3e16e2 am: a95dc0e1 am: dc19333b -s ours

am skip reason: Change-Id I8b8ab1442c3f592a4e3ce70852025b1b169d5f18 with SHA-1 98c242f6 is in history

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

Change-Id: I9b89870eedc347257139aca1ced6ba2e4ebe76de