Merge "Re-enable the MediaStore_Images_ThumbnailsTest test in pre-submit."