[automerger skipped] DO NOT MERGE: BufferStateLayer: Mirror BufferQueue...

[automerger skipped] DO NOT MERGE: BufferStateLayer: Mirror BufferQueue behavior in fence merging am: 92c2976f am: 0ebb1dde am: a39ab9c8 -s ours am: 7145699b am: ff758b97 am: 70077874 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4f2ec00a6068880a363e07d64ab63bcfea6a0764