Merge "Camera: Clarify camera2 id usage when retrieving camcorder profiles"