Merge "[RESTRICT AUTOMERGE] Refactor InternetIconInjector to SettingsLib" into sc-v2-dev am: 87515007a0

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

Change-Id: I03b77e167bc5b8765f5817ff9fc4258a39b66899