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

Change-Id: I2d174d7670287b235988eb82109f472cd67b5e9d