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

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



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