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

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

Change-Id: I6a1ba5a477ac55d22c27c6722b8809bb3871a914