Merge "Revert "Don't use WAL in TelephonyProvider to work around b/113352727"" into pi-dev am: d50eddc7c9
am: 550c133f61

Change-Id: Ibc1c95fa0b30ee6ae20849b5b98c47bb6c90bdd2