Merge "Set gravity to end if we begin clipping subviews." into udc-dev am:...

Merge "Set gravity to end if we begin clipping subviews." into udc-dev am: 46d3419b am: 26e622ce

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



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