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

Change-Id: I40f0601e49f95ae7bd194431520a9ab0b8bfc488