[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 72d7629847 -s ours

am skip reason: Merged-In Iaa6b544dadc0de4691c465a34da148a1ab15f150 with SHA-1 633efe359c is already in history

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

Change-Id: Ib7176f7b2bd2f20c1b151f15a34ab36026681f77