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

Merge "Merge "Synchronize device state update and display update callbacks" into udc-dev am: a9868f63 am: 6a7b69bb am: 36326c9c" into udc-qpr-dev-plus-aosp am: b4a31d29

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



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