Merge "Fix bug in policy engine" into udc-dev am: c31805c1 am: a6cce231 am: 165f8574

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



Change-Id: I88cc11c10d8b6d0bee9d26e6a71c25b8259a5cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>