Merge "Camera: Avoid using an uninitialized physical camera id" into qt-dev
am: b902095897

Change-Id: Iba750ee8a496d59319c6d545c01693409fad3297