Fix 2655246 file descriptor leak when accessing thumbnails

http://b/2655246

Moved from kraken to master (https://android-git.corp.google.com/g/#change,51691)

Change-Id: I7d0cffd745311d073415d597eb141e26fe1edcce