Merge "Camera: Clarify multi-camera id selection logic" into pi-dev am: 568ccfe0b6
am: 5116500c9d

Change-Id: I3fcea94d5f0cbccef69e45a6ccd98f1f60ed989b