Merge changes from topic "launch_wifi_details-sc-v2" into sc-v2-dev am: a451fd5e59 am: a80a236500

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

Change-Id: I132fcbb1839f4b511989496a4fc7acb1b2fadec9