Merge "Fix the smallest width not updated while resolving override bounds"...

Merge "Fix the smallest width not updated while resolving override bounds" into tm-qpr-dev am: 63a708db am: b9b657f5 am: ba91e5b2

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



Change-Id: If17ae02ff1fa68419bec58fa5ed8c0cb8369661a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>