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

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

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