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 am: 39f33a00

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



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