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

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



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