Merge "Fix clipTopAmount when read in 2 more critical places" into tm-dev am: 8d2aafe8

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



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