Merge "Updating AppWidgetServiceImplTest as per Mockito changes" into oc-dev am: d7bd16b258
am: 2a400805ef

Change-Id: I9313d2ac70597102b791c017d1b98f5fd14323d4