Merge "Revert "Moved BatteryStats and AppOps wakelock updates to the notifier thread"" into main