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: e82c9184

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



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