SF: Merge per-display maps in Scheduler

Fixes: 266715559
Test: libsurfaceflinger_unittest
Change-Id: Ia8934f73f237c37e8f477be5183f84a9c1a40a5a
3 files changed