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

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



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