Merge "Camera2: Add tests for the StreamConfigurationMap class" into lmp-mr1-dev