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

Change-Id: I21559690f6371102cf48132d8930343923d60011