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

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

Change-Id: I448d166f95a927b3743b4292030f0bca3650f783