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: ad27e13f am: e5c13471

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



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