[automerger skipped] Merge "Hide toggle to Turn on Wi-Fi automatically...

[automerger skipped] Merge "Hide toggle to Turn on Wi-Fi automatically preference in Search settings" into tm-qpr-dev am: 06cc4ed4 am: ada5c339 -s ours

am skip reason: Merged-In Ib2c6b90308606d32179334d13be91e308971084f with SHA-1 59403ef3 is already in history

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



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