[automerger skipped] SurfaceFlinger: Query Scheduler when updating allowed display configs am: d916d941d8
am: f9cc446fd7 -s ours
am skip reason: SHA1 f9cc446fd7 skipped by user salidoa

Change-Id: Iba0d65a25f2688bcf0667359ea4728bb8b22c843