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

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

Change-Id: Iba2f8fa3ee142eb49c91ebaa214bc75d3267220c