Merge "HWUI: reset buffer state after MakeCurrent" am: 188e20b8 am:...

Merge "HWUI: reset buffer state after MakeCurrent" am: 188e20b8 am: 8c5ac04d am: 45e4f2bd am: bed68e21

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



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