[automerger skipped] Merge "Fix cursor leak in TelephonyProvider" am: 46f8429df0 am: 3166b75108
am: f364048b95  -s ours

Change-Id: I8a59d91fb82cdbfe99dcbeae0d0ff2c9af6ef11a