Merge "Fix libgui cts crash bug" am: b6dcc4c2

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



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