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

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

Change-Id: I26cdff3a4d106427fa355eb904f7d65fdeb90de9