DO NOT MERGE - Merge ab/7272582 am: 871983671d

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

Change-Id: Ieab72ca82096bcaa2493ff4d0c246c0b4482328b