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

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

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



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