Merge "Synchronize device state update and display update callbacks" into...

Merge "Synchronize device state update and display update callbacks" into udc-dev am: a9868f63 am: 6a7b69bb

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



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