Merge "Fix memory leak in Connectivity Service when phone app crashes"