Merge "Add keywords for a few settings" into rvc-dev am: c9db73b808

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

Change-Id: Ifd35e0c5dc68bd89b7b12464691e9d42f1fee83e