Merge "Camera2: Update pixelArraySize and analog sensitivity tags"