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

Change-Id: I5025d99e35dd267ffc3a0c0393a24ebb87cc0546