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

Change-Id: I077250eef8fec9d0da4077cf02d9fa5f54f736e4