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: b278101d am: 0fa2343f

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



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