Merge "camera2: Fix frame ID returned by legacy mode shim."