Merge "fix safeMode status in AppWidgetService" am: 78a72f0698
am: cbd4ad1f7e

Change-Id: I879ba624b3d3693472e6623e084660d4cadf6b95