[automerger skipped] Merge Android 12 am: 243927d9d3 -s ours am: 1bdbdffa73 -s ours

am skip reason: Merged-In Ie77bf3871774fe44d795b6ab570ffe551509824f with SHA-1 165d593b34 is already in history

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

Change-Id: I77cd11930a0ef19a68a0f38e198ce5dfab5c0e1f