[automerger skipped] SurfaceFlinger: Query Scheduler when updating allowed display configs am: d916d941d8 am: f9cc446fd7 -s ours
am: 6ff913b040 -s ours
am skip reason: change_id Ia85a60fde55afaed5106462942e0bb77652ec737 with SHA1 0f0ddc1055 is in history

Change-Id: I07ce132bf72ea34ced86874d2c52f972b59f338e