Merge "Fix non-inclusive terms in framework device policy logic" am: 64add27a7c am: 3d3e16e2a6 am: a95dc0e13f

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

Change-Id: Ic966bd42326f6cd9909bb69853710a7385ffe643