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

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

Change-Id: I002472a99976ab198c7243baf048eeab05b83fcf