Merge "Fix last tile bottom calculation" into tm-dev am: 29a2771b am: e1118257 am: cef0bfa5

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



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