Merge "Revert "Fix ContentObserver unregister issue"" am: 31419a4ad4 am: 8625194c19
am: cd816c1853

Change-Id: I278d9449ab47f9bdecac8ad1075daed7d718544a