DO NOT MERGE Fix Activity instance leak by ContactsPreferences observer

Bug:3035107
Change-Id: I2ff80d4a77b2729be297e445ed6f65a1e0c939c8
2 files changed