[automerger skipped] Merge "RESTRICT AUTOMERGE" into rvc-qpr-dev am: b707cd3ba1 am: a573f9c4e8 -s ours am: b00a76681b

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

Change-Id: I655d7324b3c5258d9ded8d051080f63cb3073c7c