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: I63b35eee469d860ae3a1dcb9b656bb8842c34695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>