Merge "Move "max to height" roundness logic to Roundable.kt" into udc-qpr-dev...

Merge "Move "max to height" roundness logic to Roundable.kt" into udc-qpr-dev am: b5efe939 am: d7a992ac

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



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