Merge "Camera: Add logical camera related metadata in dumpsys" into qt-dev