Merge "Surface: do not evict outstanding buffer in onBuffersDiscarded" into rvc-d1-dev am: bad1977db5

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

Change-Id: I27d6018a574d44ee63628c36295169429e753c9c