Merge "Don't use WAL in TelephonyProvider to work around b/113352727"
am: 507afb36d3

Change-Id: I96d5ee9ba6c59b074a95d5230a8d46f37913682d