Merge "Clear default-browser state when it's uninstalled" into oc-dev
am: 6338cd8155

Change-Id: I950d2540bf88f7e28f17653780fb19ccdb83016d