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

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



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