[automerger skipped] Merge changes from topic "launch_wifi_details-sc-aosp"...

[automerger skipped] Merge changes from topic "launch_wifi_details-sc-aosp" into sc-v2-dev-plus-aosp am: 9cfb402b -s ours

am skip reason: Merged-In Ieb7080ab6f6462abc3820b47c2a58cc2ea2a083e with SHA-1 a9c846a5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15674526

Change-Id: I1000ee00f5c38f97fef9083845f5ddfa04457768