Merge "No code changes, this cl only reorganizes the functions" into tm-qpr-dev am: 1b14a732

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



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