Merge "Fix cursor leak in TelephonyProvider" am: 46f8429df0
am: 3166b75108

Change-Id: I0c26701eb05c27ca778c7cb7fca460776647ed36