Go Launcher: Fix icon placement retention am: 8f490e21c9 am: 42caab471a am: a88ef374f2

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

Change-Id: Icbaac483492963ae82e9b517a04c789cbf30c277