Cleaning up fixed bug am: 1aff018e17 am: 580d9735f3

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

Change-Id: I91bbc6068af6e5e3f540072aece0dbebe81bf358