Merge "Changing global variable for local variable to prevent memory leaks"...

Merge "Changing global variable for local variable to prevent memory leaks" into tm-qpr-dev am: 9c830777 am: 35252fd9

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



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