Merge "Fix log tag for SmsProviderTest" am: 657164eaa5
am: d35074ebcc

Change-Id: I820d4b7ff87110bf214d1ab95c1c3454e3830f0c