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

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

Change-Id: If85a8ef37a546b74e901215382582782be5314ec