Merge "Use DPMS lock for the policy engine" into udc-dev am: 98c8c131ac

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

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