Merge "Cleanup removal of taskbarSize from calculation" into tm-qpr-dev am: 5e432142

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



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