[automerger skipped] Merge changes from topics "launch_wifi_details-sc-qpr1-dev", "refactor_icon_injector-sc-qpr1-dev" into sc-qpr1-dev am: c6691520b1 -s ours am: 1cacbc465b -s ours
am skip reason: skipped by user zoeychen Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15611701 Change-Id: I4767df6977e2271310264735ecc99122d4c47350
This commit is contained in: