Merge "Don't use TEMP_FAILURE_RETRY on close()"
am: 0f2097c0f0

Change-Id: Icee9f6f109c24229a8fa81da0b2492c89cd2c31b