Merge "Fix corner clipping on UMO" into tm-dev am: c1170e1c

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



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