Merge "Add checking values not to save illegal value to appwidgets.xml" am: 941d4b2135
am: 1807cb4a88

Change-Id: I6e02c6dead092e8727f8ef76eaf689ef0cfec376