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: Idefa2d87b49e4ac90c07126a9dda2a6fd9feb46e