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

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

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



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