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

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

Change-Id: I63722e8f73cdb5c0efc9f0c79d845279918f0b78