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

[automerger skipped] Merge "DO NOT MERGE: BufferStateLayer: Mirror BufferQueue behavior in fence merging" am: 11b9d667 am: 4cc54d4c am: 07e65d03 -s ours am: 3f2ac9f2 am: c6bf11a0 am: b496494f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I510a62b997af6813f8ec5e371a6778695eccd732