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

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



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