Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f

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



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