Merge changes from topic "extractor-utils" into sc-dev am: 433f5b4290 am: e046e71816 am: 6ce9c07d30

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

Change-Id: I60fd0cbfa72a9e5cb122dea11b1478c814fc7f71