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: 7eb351ff

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



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