Merge "Reset mBufferInfos for setBufferInfo(s)" into main am: 7b38b43622

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2995378

Change-Id: I59d47a86531b9ce3044f2ff531eafe1b3d518195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>