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

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

Change-Id: Id57e0f919b9cc9130cef5406ca026e6ddbdb0179