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

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

Change-Id: I3da14191104bce6a87a51790665ffcd08d54549a