Weather Tile: Set Custom IconSet [2/2]

Change-Id: I3602288be03a559c6b56eec1f174ff100ba1b894

Conflicts:
	core/java/android/provider/Settings.java