Merge "Re-enable the MediaStore_Images_ThumbnailsTest test in pre-submit."
am: 0fd3c9ac2c

Change-Id: I7d00d06515bccc1ca8e36286b9920ce001cdc466