Merge "Revert "Move AppWidgetsRestoredReceiver methods to enable adding tests for restoring widget Ids"" into main