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

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



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