Merge "HWUI: reset buffer state after MakeCurrent" am: 188e20b8ca

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

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