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

Change-Id: I7ddd29766ecb6a4315ab635b16b2f480cc4915a8