[automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to...

[automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab2116 -s ours

am skip reason: Merged-In I5f857b2079e0f550e4be601d27dd54dac56b2f57 with SHA-1 1f24c6a9 is already in history

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

Change-Id: Ia495305891c49e3ffee19d7bee3f0107f6085ad3