Merge "Fix libgui cts crash bug" am: b6dcc4c2 am: 9a8ab9a0

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



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