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

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

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