Merge changes Id383d1b6,Iabd9eebe am: 96c9ca8c0b

Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/2101452

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