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

Change-Id: Ie432520a015d9584dc42a7d00acb5266c1a718ba