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

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



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