[automerger skipped] Consume pending display config change with multiple remote callbacks am: c793afe3bd -s ours am: 651708337d -s ours

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

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

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