[automerger skipped] Merge "[DO NOT MERGE] Remove one search flag and code...

[automerger skipped] Merge "[DO NOT MERGE] Remove one search flag and code from sc-v2." into sc-v2-dev am: 57b9c472 am: 8531ede9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1305cb7562d3a821674d1327454755391cc49b6b