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

Change-Id: I2b6d49cbd0201dd6b002e88158f08fc261b50119