[automerger skipped] Merge "[RESTRICT AUTOMERGE] Add new ACTION_WIFI_DETAILS_SETTINGS to Settings" into sc-v2-dev am: 8df2fccba8
am: 058f4eab1a
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15674265 Change-Id: I27e1211df8d60e0fbb1df55e68d69cc0d858c0d2
This commit is contained in: