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

Change-Id: Ie879dcf1b443563f5e3e55e15eb0dca8670d325d