Merge 25Q1 (ab/BP1A.250305.020) to AOSP main am: 4c45aad093 am: 80d01a2c1e

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

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