Merge changes Id68b6c37,I16d39d3e into sc-dev am: aa14b19725

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I651d4778d6d41a18115eaf15aede6c7ee29d62a6