[automerger skipped] Merge "sf: Fix issue with dequeueBuffer when multiple display present" am: fa5cda82 am: 72240b09 -s ours am: b8df24ac -s ours

am skip reason: Change-Id Ia8a1470affb2596b27986cc4153417f48cf4ed1c with SHA-1 e9eff974 is in history

Change-Id: I7e800f0b7767062d4ebd6516955570b945cb64be