am 73809edd: Merge "Keep the ImageData size info consistent with MediaStore and Exif" into gb-ub-photos-carlsbad

* commit '73809edd589fe54b44452cfa7c3935477d68dd5e':
  Keep the ImageData size info consistent with MediaStore and Exif