[automerger skipped] Merge 24Q3 to AOSP main am: cfa906bfbd -s ours am: d292e792b7 -s ours

am skip reason: Merged-In I5f79e8055d61017d48eac58e258cdc00113274ee with SHA-1 5d5b1b2f09 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/layoutlib/+/3258444

Change-Id: Ic0590d826604af702b95be652b99054112a00c9d
Signed-off-by: Automerger Merge Worker <[email protected]>