Merge "Revert "Revert "Don't use WAL in TelephonyProvider to work around b/113352727"""