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

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



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