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

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



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