Merge "Revert "Update calls to go through the feature interface instead..."" into sc-dev am: af0d09b98b

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

Change-Id: Ic2f21caf0101088622f305a40fd8342c6319e687