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: 93d7e7e7 am: 15b622e0

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



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