Merge "Reduce number of checks for ellipse detection" into udc-dev am:...

Merge "Reduce number of checks for ellipse detection" into udc-dev am: b5cce772 am: 1dbd87fb am: b3998181

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



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