Merge changes I46501369,Icd1ddd43 into sc-dev am: 2c2163329b am: 89384618ca am: ef38ca7c1b

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

Change-Id: I037f43deac0b7cc7c2fa4aa4cffca306af5ec4a0