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

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



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