Merge "Revert "Remove legacy database upgrade paths in AppWidgetServiceImpl."" into main