DO NOT MERGE: BufferStateLayer: Mirror BufferQueue behavior in fence merging am: 92c2976f7c am: 0ebb1dde1e

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

Change-Id: I18773a56d1d8bfb5624b220e0e8892499d34a7df