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

Change-Id: Ib09e0a5ba83959ef9ea418066c7ad16b1ab2238c