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

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

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



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