Merge "DO NOT MERGE: BufferStateLayer: Mirror BufferQueue behavior in fence merging" am: 11b9d667bd am: 4cc54d4c9b

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

Change-Id: Ie712aaac0c51e0b2c132e4dc99f7db59d30cb2f6