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: Ib9ccf19e81953596ccf2f3387d9a2ad92f787ffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>