Merge "AppWidgetServiceImpl:fix NPE in pruneWidgetStateLocked mthod ." into main