[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 am: 33285cfb -s ours am: ba974e57 -s ours

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

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



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