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 am: a2616f7b

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



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