Merge "Updating Chips UI" into sc-dev am: 8eced27076

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If28b88f14f473e1a5e7c61529a593bf1a9269a7f