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

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



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