Track opt/mms and ContactsProvider

Change-Id: I0e90b29b449c66d8b45f5f4beab8498cbbd65485