Mark ab/6881855 as merged am: 4b73f17559 am: 3db9b8b919 am: 58942a9c16

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

Change-Id: I97c9431a7aadfe2ea92c09cb9fb92d532f21f4af