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

Change-Id: I7bba78003073c79aaf692a01f0f6980b40e45598