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