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

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

Change-Id: If317b34a8c85d49862ffd4e110658c1b34f568a3