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

Merge "Fix bug in policy engine" into udc-dev am: c31805c1 am: 5b94615c am: 547d0ff2 am: ebd0622a

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



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