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

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



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