Merge "Fix assignment for last element in codegen list" into main am: 12e1764d am: 7f966b51

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



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