Merge changes I9ccb4335,I0d2f9be8 into sc-dev am: 9165c00438

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d4a8ecadf0dfac669c8448426781f623e710f71