Merge "Fix assignment for last element in codegen list" into main am: 12e1764dd6

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

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