Merge "Don't call remoteFillService.destroy() until session is removed." into oc-dev
am: 09f7dd5780

Change-Id: I0cb4095dd6d7c05615db4312fceb412c481b0420