Merge "Fix yet another clipTopAmount usage" into tm-dev am: 2d3b1c27 am:...

Merge "Fix yet another clipTopAmount usage" into tm-dev am: 2d3b1c27 am: 15583bbd am: 6c0fd7ad am: 0738d8e0

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



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