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

Change-Id: Ibeff98a264e61d9772655ca51b4811495ede6be6