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

Change-Id: I455be72533c24ceb5ea352774ded30d0c0a2367f