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

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



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