Track own ROMControl, Contacts, ContactsProvider

Change-Id: I2ad77ef12740beea5e9464892817c5eecaa370c1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1