Merge "Refine the bounds of the wrap-content sides" into sc-v2-dev am: 0e517ebc am: 2d34e05f

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

Change-Id: I211d21ddf711b36168d901a3f25a5843fde2b134