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: c845fee3 am: 14668c88

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



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