Merge "Remove usage of MetricsLogger in SmsApplication." am: b34d5a74fb am: 215397798c

Change-Id: I8b97798bac55e9083bc72c993a3733244b69b07d