Merge "Make Tips & Support page launchable from Settings Search results" into...

Merge "Make Tips & Support page launchable from Settings Search results" into udc-dev am: 5336f758

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



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