Merge "Chaser for ag/11973247 to wrap content" into rvc-dev am: 337e0afeff am: 2b51d50eb8

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

Change-Id: I1090a6fae42be963becf2704894eb2c0fd5e7400