Merge "Synchronize DeviceStateController on WindowManagerGlobalLock" into udc-dev am: b02d5b38 am: 9e8b53e3

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



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