Merge "Revert "WifiServiceImpl: Fix package removal broadcast handling"" into pi-dev