Merge "Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev am: 1cc73a57 am: 5e4b0717" into oc-mr1-dev-plus-aosp