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

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

Change-Id: I42c3e5d50b1c6a5625eaa0d38ff8d210c1004957