Merge "Camera: explicitly close ImageReader after use" into oreo-mr1-cts-dev