Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into...

Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into udc-d1-dev am: c548cdc4 am: d6ae6f86 am: 4b20b386

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



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