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

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

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



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