Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev am: 1cc73a5773
am: 5e4b071704

Change-Id: Id2768c7fbe12ce572dd53e60bb81026fe69e8ba3