Merge "Making code more readable by removing global variable used for...

Merge "Making code more readable by removing global variable used for optimizations" into tm-qpr-dev am: fda1f3c3

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20307062



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