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

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



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