Merge "Surface: do not evict outstanding buffer in onBuffersDiscarded" into rvc-d1-dev am: bad1977d am: 9773259c am: 5e7b68c3

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

Change-Id: Ibf628765fa3220317c7aea02975eb6c3a588bf3c