Merge \"Guard against null object in scheduleNotifyUpdateAppWidgetLocked\" into nyc-mr1-dev
am: 26504a611a

Change-Id: I91941346d3e376dd2813bcbb0b6f6fbd1cc5357f