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

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

Change-Id: I972192028ac90184c4ad6bb850948c30b7031080