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

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



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