Merge "Chaser for ag/11973247 to wrap content" into rvc-dev am: 337e0afe am: 2b51d50e am: 83b32d07

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

Change-Id: Ia4a70915d402dcc5f624ad85d07c2a17ca24dcb4