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

Change-Id: Icf51abae4931e58c44d5fce0a0e2fbf02e004325