am 069f4cbc: Merge "Fix memory leak in Connectivity Service when phone app crashes"

* commit '069f4cbccb651d98e4c50eca4698624ea089804d':
  Fix memory leak in Connectivity Service when phone app crashes