Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev