Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master
am: 785ab04d7a

Change-Id: I63d56be90cdf022d01fa2bf4b79d228f48e19eb1