Merge "DO NOT MERGE" into sc-dev am: 77afcf32f3

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

Change-Id: Ib7c692253cab416ad0a89a910409fd50747291e5