Merge "Fix ContentObserver unregister issue"
am: 09b6988e27

Change-Id: Ia9573b2cb453d3ff493a691675bee0f5dfc44396