[automerger skipped] [RESTRICT AUTOMERGE] Refactor InternetIconInjector to SettingsLib am: fc397649 am: b4ea6b85 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I489da945c45460dd0d70c8f4fc67e75e56fd3655