Merge "camera2: Fixed typos in StreamConfigurationMap.java"