[automerger skipped] Fix the Wi-Fi detailed settings un-editable issue. am: f914e34d28
am: 8f8348dc7b
-s ours am: 68805fd1c6
-s ours
am skip reason: Change-Id I567b2b80163631a01d165c0ac5c0aba392e014ef with SHA-1 3a45d054eb
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12894947
Change-Id: I82ae92fd7132041cf799b56122a9cd4620a732fa
This commit is contained in: