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: 87f71018

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



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