[automerger skipped] Merge "Don't use WAL in TelephonyProvider to work around b/113352727" am: 507afb36d3 am: 776b720fb6
am: f17e9f84e0 -s ours
am skip reason: change_id Idd508dfb6229a17e364d508159f1ea94a9804634 with SHA1 44b7e9a5f3 is in history

Change-Id: Ic2b696a62ab0ffbff5e62209fde9fe2b32bd6db8