am 5cf86aa7: Merge "media: Update ImageReader to remove MaxImagesAcquiredException" into klp-dev

* commit '5cf86aa7564eff8443158644e866a420d865b1bc':
  media: Update ImageReader to remove MaxImagesAcquiredException