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

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

Change-Id: I4798f84501c10b62c315260c7874cee861b4f14d