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

Change-Id: Ib2d58feec6b7df5490d781a7d842e2dd8087551e