[automerger skipped] Consolidate settings for Assist. am: 88972311a2 -s ours

am skip reason: Merged-In Id4463345c44fa4daba4eac67b5ad00aff7f3a606 with SHA-1 3081537398 is already in history

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

Change-Id: I18c2bee1e18f72e1ab01240cbcea61c9e27352cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>