[automerger skipped] Merge "DO NOT MERGE: BufferStateLayer: Mirror BufferQueue behavior in fence merging" am: 11b9d667bd am: 4cc54d4c9b am: 07e65d0320 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7f4a0e2281b2ff524bcdd2ce778ad8578a570b42