Merge "Add more search terms for WPP" into udc-dev am: 2484fa72

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



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