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

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

Change-Id: I7242a8e2fc4f532b99783c619be4a7f07c99ae69