am 2cfef50a: am 77af33f8: Merge "camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader" into lmp-dev

* commit '2cfef50a34cbffa77f15ee1e5fe962b8bc6659ed':
  camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader