[automerger skipped] Merge "Add config for Wi-Fi Hotspot Settings hidden" into...

[automerger skipped] Merge "Add config for Wi-Fi Hotspot Settings hidden" into tm-qpr-dev am: 87d2f6d3 am: dda18d1d -s ours

am skip reason: Merged-In I11f88d0d15d6d5c2766b64b5847ac31ed0f34c25 with SHA-1 160b5078 is already in history

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



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