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 am: 2ad7d205

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



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