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

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

Change-Id: Ib6d14fb7f14b8e016cbbd75f637dcb5aa54a2455