Merge changes I0e4cedbf,Idfa1b82c into sc-dev am: 16126eedcd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id60dcfb6babf292f4e77fe367b87d43910632575