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

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

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