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

Change-Id: I3f75c0bd9928013ce04b86a93e16f43eacb3a588