Merge "Add USB config constants to metrics proto"