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

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

Change-Id: Id941048c2d068278e75c0a0a57f13ad26ab1980e