Merge "SF: Merge per-display maps in Scheduler" into udc-dev am: 60cd58c1 am: c125bc4c

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



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