Merge "Remove "Hotspot" key from settings search if not needed" into...

Merge "Remove "Hotspot" key from settings search if not needed" into tm-qpr-dev am: 58292e70 am: 155beb06

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



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