[automerger skipped] Merge "[RESTRICT AUTOMERGE] Refactor InternetIconInjector to SettingsLib" into sc-v2-dev am: 87515007a0 am: 010395c257 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ibb35d218d9868b5ed39d8961be40eb93fc98713c