[automerger skipped] DO NOT MERGE: BufferStateLayer: Mirror BufferQueue behavior in fence merging am: 92c2976f7c am: 0ebb1dde1e am: a39ab9c8b3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icaffe30caafbb5e9d442ad3942a841961b29f711