[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 9be0f7fe4f -s ours

am skip reason: Merged-In Ia4baa55e8a85faf24c7fcaafb99b5c7799dc233e with SHA-1 8d2a97e8ba is already in history

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

Change-Id: I1b4972229440baf5d33900e747a519cb13e801f8