Merge "fix safeMode status in AppWidgetService" am: 78a72f0698 am: cbd4ad1f7e am: 5a3034f8ff
am: 2f51366c1a

Change-Id: I64ed50a3f2d6fa20650c047bda0da1ad0cd292f4