Merge "Fix potential crash in ImageTransformState" am: 4ab85d92e9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2375267

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