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

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

Change-Id: I4d1da0a0e441636407efed0eae141fdc393e7e8d