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

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



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