Fix for invalid memory access. am: c82569e37a

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/incremental_delivery/+/19937554

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