[automerger skipped] Merge "Consume pending display config change with...

[automerger skipped] Merge "Consume pending display config change with multiple remote callbacks" into udc-qpr-dev-plus-aosp am: dc0178c1 -s ours

am skip reason: Merged-In I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf with SHA-1 35810b93 is already in history

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



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