[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "launch_wifi_details-sc-qpr1-dev", "refactor_icon_injector-sc-qpr1-dev" into sc-qpr1-dev am: c6691520 am: ed410c03 -s ours am: 1e07f06c -s ours

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

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

Change-Id: I51c25f8643ddf1b2a1be0df1bc2f124453b11163